merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 17 May 2011 11:52:28 +0000 (20:52 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 17 May 2011 11:52:28 +0000 (20:52 +0900)

Trivial merge